Olaf Klein contributes Garmin Mapsource ".gdb" format reader.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 5ac6fbb78e3ce108d6ce42b7082f7ac1e2add0b0..516fca846b9d38e6d641c76ea1557aa81845f5ad 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -28,7 +28,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
        ozi.o nmea.o text.o html.o palmdoc.o netstumbler.o hsa_ndv.o \
        igc.o brauniger_iq.o shape.o hiketech.o glogbook.o coastexp.o \
        vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o \
-       tef_xml.o maggeo.o pathaway.o vitosmt.o
+       tef_xml.o maggeo.o pathaway.o vitosmt.o gdb.o
 
 FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o trackfilter.o
 
@@ -191,6 +191,8 @@ magproto.o: magproto.c defs.h queue.h gbtypes.h magellan.h
 main.o: main.c defs.h queue.h gbtypes.h
 mapsend.o: mapsend.c defs.h queue.h gbtypes.h mapsend.h magellan.h
 mapsource.o: mapsource.c defs.h queue.h gbtypes.h garmin_tables.h
+gdb.o: gdb.c defs.h queue.h gbtypes.h garmin_tables.h \
+    jeeps/gpsmath.h garmin_tables.h
 mkshort.o: mkshort.c defs.h queue.h gbtypes.h
 navicache.o: navicache.c defs.h queue.h gbtypes.h
 netstumbler.o: netstumbler.c defs.h queue.h gbtypes.h csv_util.h

diff --git a/gpsbabel/README b/gpsbabel/README
index 906d45242d279b0ff6c328fe85b2ef7d853c9110..cc5a263c3b6764844f146d8486650b3a64cf96e5 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -845,6 +845,14 @@ THE FORMATS
        VitoNavigator II on the Pocket PC.
 
 
+    GDB
+
+        Support for the "Garmin GPS Database" format used by default
+        in MapSource versions 6.1 and later. With this first step you
+        should be able to read waypoints, routes and tracks from .gdb
+        files.
+
+
 DATA FILTERS
 
        GPSBabel supports data filtering.  Data filters are invoked from

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 2a4880f78c041642460383d9aa633e56d2fd55ac..8de80b592bbec6d3a54d481842eb91736d4a448c 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -462,6 +462,7 @@ void waypt_status_disp(int total_ct, int myct);
 void fatal(const char *, ...)
 #if __GNUC__
        __attribute__ ((__format__ (__printf__, 1, 2)))
+       __attribute__((noreturn))
 #endif
        ;
 void warning(const char *, ...)

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index c391b813b8ed554f3392a89f78399f5e7f87125c..a05e4339c789ee9ad7edd77424dbb1ab2000635e 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -83,6 +83,7 @@ extern ff_vecs_t tomtom_vecs;
 extern ff_vecs_t tef_xml_vecs;
 extern ff_vecs_t ppdb_vecs;
 extern ff_vecs_t vitosmt_vecs;
+extern ff_vecs_t gdb_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -405,6 +406,12 @@ vecs_t vec_list[] = {
                "Vito Navigator II tracks",
                "smt"
        },      
+       {
+               &gdb_vecs,
+               "gdb",
+               "Garmin Database",
+               "gdb"
+       },      
        {
                NULL,
                NULL,